Sync ICAO country code table with Wikipedia

diff --git a/garmin_tables.cc b/garmin_tables.cc
index 5b3f5e642769d4bd275d744b631e78751532e730..4ff02daa332ffa8ea5e3b8d6d2ea3b17b614e678 100644 (file)
--- a/garmin_tables.cc
+++ b/garmin_tables.cc
@@ -353,9 +353,9 @@ icon_mapping_t garmin_smart_icon_table[] = {
   {    -1,    -1, NULL }
 };
 
-/* ICAO coutry code table */
+/* ICAO country code table */
 
-/* source: http://en.wikipedia.org/wiki/ICAO_airport_code */
+/* source: https://en.wikipedia.org/wiki/ICAO_airport_code */
 
 gt_country_code_t gt_country_codes[] = {
   { "ZM,", "Mongolia" },
@@ -363,9 +363,11 @@ gt_country_code_t gt_country_codes[] = {
   { "Z*,", "China" },
   { "Y*,", "Australia" },
   { "WS,", "Singapore" },
-  { "WM,", "Brunei/Malaysia" },
-  { "WB,", "Malaysia" },
+  { "WP,", "Timor-Leste" },
+  { "WM,", "Malaysia (Peninsular Malaysia)" },
+  { "WB,", "Brunei, Malaysia (East Malaysia)" },
   { "WA,WI,WQ,WR,", "Indonesia" },
+  { "VY,", "Myanmar" },
   { "VV,", "Vietnam" },
   { "VT,", "Thailand" },
   { "VR,", "Maldives" },
@@ -375,60 +377,66 @@ gt_country_code_t gt_country_codes[] = {
   { "VL,", "Laos" },
   { "VH,", "Hong Kong" },
   { "VG,", "Bangladesh" },
-  { "VD,", "Kampuchea" },
+  { "VD,", "Cambodia" },
   { "VC,", "Sri Lanka" },
-  { "VB,VY,", "Myanmar/Burma" },
   { "VA,VE,VI,VO,", "India" },
-  { "UR,", "Kazakhstan/Russia" },
-  { "UT,", "Kazakhstan/Tadzhikistan/Turkmenistan/Uzbekistan" },
-  { "UM,", "Belorussia/Russia" },
+  { "UT,", "Tajikistan, Turkmenistan, Uzbekistan" },
+  { "UM,", "Belarus and Russia (Kaliningrad Oblast)" },
   { "UK,", "Ukraine" },
+  { "UG,", "Georgia" },
+  { "UD,", "Armenia" },
+  { "UC,", "Kyrgyzstan" },
   { "UB,", "Azerbaijan" },
-  { "UA,", "Kazakhstan/Kirgizia" },
+  { "UA,", "Kazakhstan" },
   { "U*,", "Russia" },
-  { "TX,", "Bermuda" },
-  { "TV,", "St Vincent and the Grenadines" },
-  { "TU,", "British Virgin Islands" },
+  { "TX,", "UK (Bermuda)" },
+  { "TV,", "Saint Vincent and the Grenadines" },
+  { "TU,", "UK (British Virgin Islands)" },
   { "TT,", "Trinidad and Tobago" },
-  { "TR,", "Montserrat Island" },
-  { "TQ,", "Anguilla" },
-  { "TN,", "Aruba/Neth Antilles" },
-  { "TL,", "St Lucia" },
-  { "TK,", "St Kitts/Nevis Islands" },
-  { "TJ,", "Puerto Rico" },
+  { "TR,", "UK (Montserrat)" },
+  { "TQ,", "UK (Anguilla)" },
+  { "TN,", "Caribbean Netherlands, Aruba, Curaçao, Sint Maarten" },
+  { "TL,", "Saint Lucia" },
+  { "TK,", "Saint Kitts and Nevis" },
+  { "TJ,", "USA (Puerto Rico)" },
+  { "TI,", "USA (U.S. Virgin Islands)" },
   { "TG,", "Grenada" },
-  { "TF,", "Guadeloupe/Martinique" },
+  { "TF,", "France (Guadeloupe, Martinique, Saint Barthélemy, Saint Martin)" },
   { "TD,", "Dominica" },
   { "TB,", "Barbados" },
-  { "TA,", "Antigua" },
+  { "TA,", "Antigua and Barbuda" },
   { "SY,", "Guyana" },
   { "SV,", "Venezuela" },
   { "SU,", "Uruguay" },
   { "SP,", "Peru" },
-  { "SO,", "French Guiana" },
+  { "SO,", "France (French Guiana)" },
   { "SM,", "Suriname" },
   { "SL,", "Bolivia" },
-  { "SK,", "Colombia/San Andres" },
+  { "SK,", "Colombia" },
+  { "SH,", "Chile" },
   { "SG,", "Paraguay" },
-  { "SF,", "Falkland Islands" },
+  { "SF,", "United Kingdom (Falkland Islands)" },
   { "SE,", "Ecuador" },
-  { "SC,", "Chile/Easter Island" },
-  { "SB,SD,SN,SS,SW,", "Brazil" },
+  { "SC,", "Chile (including Easter Island)" },
+  { "SB,SI,SJ,", "Brazil" },
   { "SA,", "Argentina" },
-  { "S1,", "Antarctica (Argentina/Chile)" },
   { "RP,", "Philippines" },
+  { "RO,", "Japan (Okinawa)" },
   { "RK,", "South Korea" },
-  { "RJ,", "Japan" },
+  { "RJ,", "Japan (Mainland)" },
   { "RC,", "Taiwan" },
-  { "PW,", "Wake Island" },
-  { "PT,", "Caroline Islands/Micronesia/Palau" },
-  { "PM,", "Midway Islands" },
+  { "PW,", "USA (Wake Island)" },
+  { "PT,", "Federated States of Micronesia, Palau" },
+  { "PM,", "USA (Midway Island)" },
+  { "PL,", "Kiribati (Line Islands)" },
   { "PK,", "Marshall Islands" },
-  { "PJ,", "Johnston Atoll" },
-  { "PG,", "Guam/Mariana Islands/Northern Mariana Islands" },
-  { "PC,", "Kiribati" },
-  { "P",   "Oakland Octa" },
-  { "OY,", "Yemen Arab Rep" },
+  { "PJ,", "USA (Johnston Atoll)" },
+  { "PH,", "USA (Hawaii)" },
+  { "PG,", "USA (Guam, Northern Mariana Islands)" },
+  { "PC,", "Kiribati (Canton Airfield, Phoenix Islands)" },
+  { "PB,", "USA (Baker Island)" },
+  { "PA,PF,PO,PP,", "USA (Alaska)" },
+  { "OY,", "Yemen" },
   { "OT,", "Qatar" },
   { "OS,", "Syria" },
   { "OR,", "Iraq" },
@@ -437,20 +445,20 @@ gt_country_code_t gt_country_codes[] = {
   { "OM,", "United Arab Emirates" },
   { "OL,", "Lebanon" },
   { "OK,", "Kuwait" },
-  { "OJ,", "Jordan" },
+  { "OJ,", "Jordan and the West Bank" },
   { "OI,", "Iran" },
   { "OE,", "Saudi Arabia" },
   { "OB,", "Bahrain" },
   { "OA,", "Afghanistan" },
-  { "NZ,PL,", "New Zealand" },
-  { "NW,", "New Caledonia" },
+  { "NZ,", "New Zealand, Antarctica" },
+  { "NW,", "France (New Caledonia)" },
   { "NV,", "Vanuatu" },
-  { "NT,", "French Polynesia/Society Islands/Tuamotu Islands" },
-  { "NS,", "American Samoa/Western Samoa" },
-  { "NL,", "Futuna Island/Wallis Island" },
+  { "NT,", "France (French Polynesia)" },
+  { "NS,", "Samoa, United States (American Samoa)" },
+  { "NL,", "France (Wallis and Futuna)" },
   { "NI,", "Niue" },
-  { "NG,", "Kiribati/Tuvalu" },
-  { "NF,", "Fiji Island/Tonga" },
+  { "NG,", "Kiribati (Gilbert Islands), Tuvalu" },
+  { "NF,", "Fiji, Tonga" },
   { "NC,", "Cook Islands" },
   { "MZ,", "Belize" },
   { "MY,", "Bahamas" },
@@ -458,69 +466,68 @@ gt_country_code_t gt_country_codes[] = {
   { "MU,", "Cuba" },
   { "MT,", "Haiti" },
   { "MS,", "El Salvador" },
-  { "MR,", "Costa rica" },
+  { "MR,", "Costa Rica" },
   { "MP,", "Panama" },
   { "MN,", "Nicaragua" },
   { "MM,", "Mexico" },
   { "MK,", "Jamaica" },
-  { "MI,TI,", "Virgin Islands (U.S.)" },
   { "MH,", "Honduras" },
   { "MG,", "Guatemala" },
   { "MD,", "Dominican Republic" },
-  { "MB,", "Turks Island/Caicos Island" },
+  { "MB,", "Turks and Caicos Islands" },
   { "LZ,", "Slovakia" },
-  { "LY,", "Yugoslavia" },
+  { "LY,", "Serbia and Montenegro" },
   { "LX,", "Gibraltar" },
   { "LW,", "Macedonia" },
-  { "LV,", "Gaza" },
+  { "LV,", "Palestinian Territories" },
   { "LU,", "Moldova" },
   { "LT,", "Turkey" },
   { "LS,", "Switzerland" },
   { "LR,", "Romania" },
-  { "LQ,", "Bosnia-Herzegovina" },
-  { "LP,", "Portugal/Azores/Madeira Islands" },
+  { "LQ,", "Bosnia and Herzegovina" },
+  { "LP,", "Portugal (including the Azores and Madeira)" },
   { "LO,", "Austria" },
   { "LN,", "Monaco" },
   { "LM,", "Malta" },
-  { "LL,", "Israel/Jerusalem" },
-  { "LK,", "Czech" },
+  { "LL,", "Israel" },
+  { "LK,", "Czech Republic" },
+  { "LJ,", "Slovenia" },
   { "LI,", "Italy" },
   { "LH,", "Hungary" },
-  { "LG,", "Slovenia" },
   { "LG,", "Greece" },
-  { "LF,", "France" },
-  { "LF,", "Miquelon Island/St Pierre Island" },
-  { "LE,", "Spain" },
+  { "LF,", "France (Metropolitan France; including Saint-Pierre and Miquelon)" },
+  { "LE,", "Spain (mainland section and Balearic Islands)" },
   { "LD,", "Croatia" },
-  { "LC,", "Cyprus/Turkey (Northern Cyprus)" },
+  { "LC,", "Cyprus" },
   { "LB,", "Bulgaria" },
   { "LA,", "Albania" },
-  { "K*,X*,PA,PB,PF,PJ,PL,PM,PO,PP,PH,PW,", "United States of America" },
+  { "K*,", "United States of America" },
   { "HU,", "Uganda" },
   { "HT,", "Tanzania" },
-  { "HS,", "Sudan" },
+  { "HS,", "Sudan and South Sudan" },
   { "HR,", "Rwanda" },
-  { "HL,", "Libya, Spa Jamahiriya" },
+  { "HL,", "Libya" },
   { "HK,", "Kenya" },
   { "HH,", "Eritrea" },
   { "HE,", "Egypt" },
-  { "HD,HF,", "Djibouti" },
-  { "HC,", "Somalia" },
+  { "HD,", "Djibouti" },
+  { "HC,", "Somalia (including Somaliland)" },
   { "HB,", "Burundi" },
   { "HA,", "Ethiopia" },
   { "GV,", "Cape Verde" },
-  { "GU,", "Guinea Tepublic" },
+  { "GU,", "Guinea" },
+  { "GS,", "Western Sahara" },
   { "GQ,", "Mauritania" },
   { "GO,", "Senegal" },
-  { "GM,", "Morocco/Ad Dakhla/La'Youn" },
+  { "GM,", "Morocco" },
   { "GL,", "Liberia" },
   { "GG,", "Guinea-Bissau" },
   { "GF,", "Sierra Leone" },
-  { "GE,", "Melilla" },
-  { "GC,", "Canary Island" },
-  { "GB,", "Gambia" },
+  { "GE,", "Spain (Ceuta and Melilla)" },
+  { "GC,", "Spain (Canary Islands)" },
+  { "GB,", "The Gambia" },
   { "GA,", "Mali" },
-  { "FZ,", "Democratic Republic of Congo" },
+  { "FZ,", "Democratic Republic of the Congo" },
   { "FY,", "Namibia" },
   { "FX,", "Lesotho" },
   { "FW,", "Malawi" },
@@ -528,50 +535,52 @@ gt_country_code_t gt_country_codes[] = {
   { "FT,", "Chad" },
   { "FS,", "Seychelles" },
   { "FQ,", "Mozambique" },
-  { "FP,", "Sao Tome & Principe" },
+  { "FP,", "São Tomé and Príncipe" },
   { "FO,", "Gabon" },
   { "FN,", "Angola" },
-  { "FM,", "Madagascar/Comoros/Reunion/Mayotte Islands" },
+  { "FM,", "Comoros, France (Mayotte and Réunion), and Madagascar" },
   { "FL,", "Zambia" },
   { "FK,", "Cameroon" },
-  { "FJ,", "Chagos Archipelago/British Indian Ocean Territory" },
+  { "FJ,", "British Indian Ocean Territory" },
   { "FI,", "Mauritius" },
-  { "FH,", "Ascension Island/St Helena Island" },
-  { "FG,", "Equitorial Guinea" },
+  { "FH,", "Saint Helena, Ascension and Tristan da Cunha" },
+  { "FG,", "Equatorial Guinea" },
   { "FE,", "Central African Republic" },
   { "FD,", "Swaziland" },
-  { "FC,", "Congo" },
+  { "FC,", "Republic of the Congo" },
   { "FB,", "Botswana" },
-  { "FA,", "South African Republic" },
+  { "FA,", "South Africa" },
   { "EY,", "Lithuania" },
   { "EV,", "Latvia" },
+  { "ET,", "Germany (military)" },
   { "ES,", "Sweden" },
   { "EP,", "Poland" },
   { "EN,", "Norway" },
   { "EL,", "Luxembourg" },
-  { "EK,", "Denmark/Faroe Island" },
+  { "EK,", "Denmark and the Faroe Islands" },
   { "EI,", "Ireland" },
   { "EH,", "Netherlands" },
-  { "EG,LX,", "United Kingdom" },
+  { "EG,", "United Kingdom (and Crown dependencies)" },
   { "EF,", "Finland" },
   { "EE,", "Estonia" },
-  { "ED,ET,", "Germany" },
+  { "ED,", "Germany (civil)" },
   { "EB,", "Belgium" },
   { "DX,", "Togo" },
   { "DT,", "Tunisia" },
   { "DR,", "Niger" },
   { "DN,", "Nigeria" },
-  { "DI,", "Ivory Coast" },
+  { "DI,", "Côte d'Ivoire" },
   { "DG,", "Ghana" },
   { "DF,", "Burkina Faso" },
   { "DB,", "Benin" },
   { "DA,", "Algeria" },
   { "C*,", "Canada" },
+  { "BK,", "Kosovo" },
   { "BI,", "Iceland" },
   { "BG,", "Greenland" },
   { "AY,", "Papua New Guinea" },
   { "AN,", "Nauru" },
-  { "AG,", "Solomon Island" },
+  { "AG,", "Solomon Islands" },
   { NULL, NULL }
 };
 
@@ -729,7 +738,7 @@ gt_switch_display_mode_value(const unsigned char display_mode, const int protoid
   }
 }
 
-const QString 
+const QString
 gt_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
 {
   if ((garmin_format == GDB) && (icon >= 500) && (icon <= 563)) {
@@ -964,7 +973,7 @@ gt_lookup_grid_type(const char* grid_name, const QString& module)
     }
   }
 
-  Fatal() << module << ": Unsupported grid (" << grid_name << 
+  Fatal() << module << ": Unsupported grid (" << grid_name <<
                        ". See GPSBabel help for supported grids.\n";
 
   return grid_unknown; /* (warnings) */
@@ -1019,7 +1028,7 @@ gt_lookup_datum_index(const char* datum_str, const QString& module)
   }
 
   if (result < 0) {
-    Fatal() << module << ": Unsupported datum (" << datum_str << 
+    Fatal() << module << ": Unsupported datum (" << datum_str <<
                          "). See GPSBabel help for supported datums.";
   }
   return result;